Completed partitioning 4.4.1.2
Also fixed build error in OctetOps