Cherry pick jeff's ohm commit on top of latest osm master, with additional string changes and fixes