fix page factory
Merge branch 'develop'