Merge branch 'hotfix/2.2.4'
Fixed settings.scss indentation issues
Merge branch 'hotfix/2.2.5' into develop