merge aviraldg: OSM settings fix