Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2