osmo-dev changes for OsmoBSCNAT