+1 for aligning the behavior on Elasticsearch. Requalifying as bug, since the current behavior is not the one we want and will need to change in a backwards-incompatible way.

To get Lucene’s unified highlighter to behave in the same way, we’d need to have our custom implementation of both PassageFormatter and FieldHighlighter