Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2