Merge "Copy correct definition to the backup stack"
tree: 788b62fac088c082a853e68b4fe6873444cde9c8
  1. common/
  2. functional/
  3. scenario/