Pull request for #1851 about page changes