Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'