fix for windows build & static analysis for #3544
===VersionHistory:None===