Add arrowhead changes from master