Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2