Merge branch 'remove-config-agent' into 'develop'