Merge commit '1d1df82093fdacb2cbc443c70c80f8f801002d28' into release/2.2