Merged in issue/CONF-40716 (pull request #31)
CONF-40716 Work around for getting the current page
Fix up tests
CONF-40716 Work around for getting the current page
Fix up tests