Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4