GPII-177: Addressing last comment from Yura about fluid.set