osmo-iuh.git branch laforge/wip updated. 01de8d716a2fbf2b2a951edc20178c5abd24a080