implement stricter scan rules
Fix build error, with note for josh
Merge branch 'devcli' into server
merge client and server packages