Merge branch 'release-2.140.126' into dev