New version of our forked omnibus build