BATCH-2031: Addressed the use case of overlapping delimiters
BATCH-2031: Addressed the use case of overlapping delimiters

* BATCH-2031:
  BATCH-2031: Addressed the use case of overlapping delimiters