434810 better handling of bad messages
434810 better handling of bad messages
Merge branch 'master' into windows-scan-eof