Merge commit '3670942fae7beb2bfde52557ee95eab5f536e624' into release/2.2