Add arrowhead changes from master

PR after urgent Repo clean up
Use 2 (not 1) spaces for indentation.<br>Trailing whitespace detected.