Merge "Fixes command line too long error on Windows"