Merge "Non-destructive upgrade for deprecated resources"
tree: a39fc645ee960a6dcfec65a921d1fc803ce908a6
  1. common/
  2. functional/
  3. scenario/