Merge branch 'dev' into black-page-transitions-design-updates