refs #10019. Minor modifications.
Merge branch 'feature/10019_direction_angles' into develop