Nerf Switch Arrows.
Merge branch 'master' into withStaticInstance