Merge commit '5ae5a84778fa1e9a9a61aa218fad6244d1e9cdb1' into release4.11.0