Merge branch 'fix/omap' into fixes