Fix spacing
Better feature naming
fixes git ship
Bug fix
Fix git sync
Fix git sync-fork
Merge branch 'master' into kg-shellcheck