merge in master-release history after reset to 85bf533e7e27e63c851d839f0ca6d9b57a4284b5
tree: c1e7c96453928f9cd6e7a81e0d23fbde9929e24b
  1. res-common/
  2. src/
  3. tests/