Provide minimal diff option
Update with master