Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2