Merge branch 'remove/managed-config-option' into 'develop'