Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4