Change version to 0.2.2, cherry-pick OR bug fix