Merge branch 'ib-omap' into devel