Fix improper cast of <row_count> from int64 (on some systems) to int32
Merge branch 'null-values-fix'