fixed merge conflict
Merge branch 'page-proofs' into develop