Merge branch 'fix/2323-release-configuration-provider' into 'develop'