EXM-27343: Change tracking - "Surround With" strategy