Merge branch 'release' into bug-1221