Merge branch 'master' into 4.0.0