Cherry pick to release-2.2 of tickets that were not included in 2.2.0