Fix pages and tests.
Merge branch 'Issue2095' into bootstrap