Hardmerge omnirom display-caf