Merge branch 'omap/fixes-non-critical' into late/cleanup