Merge "Fix skip tracker regex for multi-line skips"