Add arrowhead changes from master

PR after urgent Repo clean up
Extra empty line detected at body beginning.