Merge branch 'master' into v7.0