Merge branch '3-2-1-release' into 'master'