Further hybrid support
QRG_SET treatment
External partitioning