Manually merging communication.c
Manual merge of fluid.c
Manual merge
Manual merge
Manual merge
Manual merge