Merge branch 'no-row-col-objs'