Merge commit '0b5a634dabb00c04a492a08375e29c6885c1486f' into release4.16.0