Add fish to use flags
Sysupdate
Merge branch 'master' into g2-pc