Merge "Refactor DiffStatus into a class"