Fix bug in PropDivXYZ + refactor TwoBucketPropagationEngine
Merge branch 'feature-pren' into develop