Merge branch 'qed-Add-support-for-new-multi-partitioning-modes'