Merge "Opportunistic cleanup"
tree: 2cdbbb9843cd28f3a0463b9f582c7dd70860085c
  1. core/
  2. services/
  3. tests/