Ned/cherry pick pr 1740

This pulls in PR 1740, which is Don's fix for STUD-979