fix a bug with missing row-build class
Merge branch 'develop' into staging