[TASK] Outsource flux collapse
Merge pull request #537 from hmspl/collapse

[TASK] Outsource flux collapse