Merge "Allow customizing classes inside of diffs"