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