Merge branch 'master' into release_prepare