Merge branches 'combine', 'symbiosis-fix' and 'warlock-fixes'