Merge branch 'release-2.140.93' into dev