merge from open-source master
tree: 1026afbc3b65db093e4971591c8e8e68f82e2ad3
  1. core/
  2. services/