bump. remove no_shipping dependency
fix merge conflict
t push origin 2-1-stable
Merge branch '2-2-stable' into 2-1-stable