Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4