merge in jb-mr1-release history after reset to jb-mr1-dev
tree: df4974249cddb0e7382b310b1a51a85c20030b5a
  1. tests/