Draft on top of !95 (merged), only the last 2 commits are new.
Since we removed the blocklist that forces OMX in some cases, it's not used anymore.