Merge commit '1a922025' into release-5.0-reverted-222