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