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