Merge branch 'admin-config-description' into 'develop'