Merge "Moar pre-partitioning refactoring." into oc-dev