Merge branch 'fix-releases' into 'develop'