Merge "Fix a stupid NPE"
tree: cca6f427a13e2d3321fc5ab04812d1b1435758fb
  1. core/
  2. services/
  3. tests/