Merge branch 'release-4.0' into jerel/client-parse-error

Merge branch 'release-4.0' into jerel/client-parse-error #2776