merge in master-release history after reset to master
tree: 447543875a1772c7070e6513da42f088d5127a31
  1. core/
  2. services/
  3. tests/