Merge commit 'd513c6a0ee582d22b6e793286774abbde01f6680' into release/2.2