Draft: Resolve "Update OSMOSIS branch"

Closed George Nurser requested to merge 281-update-osmosis-branch-2 into 4.2.1