add silly dropped cases for localizing and/or
merge
Tidying (mostly renaming) in ONF
Detangle conflict