Merge branch 'master' into 3.5.2-merge