Merge branch 'release-4.0.x'

Review Request #2036 — Created Nov. 10, 2020 and updated Sept. 20, 2021, 8:10 p.m. — Latest diff uploaded Nov. 10, 2020, 2:54 p.m.