Merge commit '7244cefd6e6ba7258cb022dfd7a284099d88a3e8' into release/2.4