Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4