Revert "Revert "Merged Hybrid Mode""

This reverts commit 37015bdb5cb4f30d0cecac047bb32dd05522458c.