Merge "Fix incorrect comparator implementation leading to IllegalArgumentException." into cw-e-dev
tree: b71c3127f196c8d6e5931733ad34b10702c5e79a
  1. service/