Merge branch 'release-2.140.134' into main