Squashed merge
Merge branch 'core-squashed'

Conflicts:
	Resources/views/Administration/layout.html.twig
	Resources/views/Theme/templates/common.less.twig