Merge branch 'feature-settings-page' into development