Merge "Fix NPE in toString"
tree: 36822b5059589d7a432c5c48f68b17921759bf24
  1. core/
  2. services/