Populate missing fields in CSV headers
Merge branch 'fix/1639' into develop