Maintain assay order in file using an orderedmap.
Merge remote-tracking branch 'origin/development' into development