Merge branch 'release' into 2.9