Upstream version of Omnibus + updated software