more code cleanup
Merge branch 'build_pages' into develop
Merge branch 'release-1.16'