Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4