merge in direction fixes from dev into omc branch
post merge