Merge branch 'master' into stable-5.12