Merge "Refactor diffs"