Merge branch 'master' into trunk-tracking
release: version 1.6.29.7 -> 1.7.30.1