Merge "Fix regression in change tracking"