Merge commit '77eb3d9a60a9c2bb6d87c960ac186af242bbcc9e' into release/2.4