Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4