merge (-s ours) history of HRI06B
tree: e585efffd093b224f8b8f172d93f164a7b1a8d8e
  1. core/
  2. services/