Merge remote-tracking branch 'remotes/origin/releases/6.1.x' into
releases/7.0.x