Merge remote-tracking branch 'origin/release-4.0.x'

Review Request #2209 — Created Aug. 20, 2021 and updated Aug. 30, 2021, 5:28 a.m. — Latest diff uploaded Aug. 20, 2021, 1:41 a.m.