Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2