Merge branch 'release/1.1.2' into develop
merge parent page settings with modular page settings
Admin checks
PSR fixes
version update
Merge branch 'release/1.1.3'