OE-6570 updates NOD export with changes from OE-6099
OE-6570 updates NOD export with changes from OE-6099

FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes