FLUID-4903: updated the pull to @amb26's comments.