Add arrowhead changes from master

PR after urgent Repo clean up