Proper handling of null values in a row
Merge branch 'develop' into feature/scala_reflection