Add arrowhead changes from master

PR after urgent Repo clean up
Trailing whitespace detected.