Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2