[TASK] Merge submodule fluid into core