Merge commit '40c59c6c' into release-5.0-reverted-222