FLUID-5449: Changed another 1.5 to 2.0