Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2