merge in master-release history after reset to 4f0c798e3f594be67e2cd036fe049bcdbad106ed
tree: b8c31f19c6d8711aec11dd812ea07d61bcb29c24
  1. res-common/
  2. src/
  3. tests/