import patch from RT #85143
bump version to 0.2.2_02
Update changes