Merge commit '0566ab4d3d' into merge-2.4