Merge branch 'feature/update-labels-for-activating-settings' into 'develop'