Merge "check for column_display_name as null" into rvc-dev