Feature/dirty checking

Fast-forward 'feature/dirty-checking' branch, test for new fields in diff