Merge "Fix a theoretical NPE"
tree: 7e6f3b6c87b218a1b38c0e44b3bbcea4d2400c5d
  1. core/
  2. services/
  3. tests/