Merge commit '0d3a7dd26490156b607541dd2e1faeaa0fc61a88' into release/2.4