Merge branch 'release-2.140.122' into dev