Merge branch 'BS-6668_CustomPage' into 'master'