Merge "CLI for OSM"