Add arrowhead changes from master

PR after urgent Repo clean up
1 trailing blank lines detected.