Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4