Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2