push existing fix into 2.2 branch

cherry-pick 782178988825a915decb4aeed3991047ff107bf5
Ticket: #7984