[WIP] Testing branch of omnibus-software