Change Patch.difference semantics f-me/carma#2117 f-me/carma#2344
Completely drop legacy model name helpers
Merge branch 'master' into mini