Merge "Correct reraising of exception"
tree: 7849da87e86dcd2a2624008956b50f4330baa41f
  1. common/
  2. functional/
  3. scenario/