Standard arrows don't need a perm to be switched to.
Merge branch 'master' into withStaticInstance