Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4