correct the primary track name
introduce another NoPrint marker
Merge pull request #736 from debrief/issue714_osprey

Issue714 osprey