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