Merge "Merge branch 'master' into v7.0" into v7.0