Merge "prevent nullptr dereference when calling unwanted"
tree: b7581e172726eeae723ac48160b4560a3378e666
  1. service-t/
  2. tests/