osmo-iuh.git branch laforge/wip updated. b66c5d0e623c3283ac2221cb0f3d6d23004b438d