Merge branch 'pre-release-cleanup' into develop