Fixed row fluids and arg
Merge branch 'develop' into staging