Merge branch 'release-2.140.135' into main