Add arrowhead changes from master

PR after urgent Repo clean up
Extra blank line detected.