Merge commit '2c20b30f' into release-5.0-reverted-222