Merge branch 'hotfix/rexus-update-fix'
fix issue of page generation
Merge branch 'hotfix/rexus-update-fix2' into develop