Merge commit '6c4d98ed' into release-5.0-reverted-222