Merge commit '5b78602c' into release-5.0-reverted-222