`Hybrid mode` is still in use and should be supported. Expand the support from pure `Unified mode` to `Hybrid mode`
Hybrid modeis still in use and should be supported. Expand the support from pureUnified modetoHybrid mode