Fix PageUser inheritance
Merge branch 'develop' into perf