prevent arrowhead label from showing up when arrowhead not in session
Merge branch 'master' into release