Merge commit 'edce617a5' into merge-2.4 (-s ours)