Merge "SPM: Add third cactus partition to manifests" into integration