Merge branch 'master' into next-minor