Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4