Merge 'master' into v7.0 for v7.1.0

No match.