
Performance improvement and Windows-specific bugfix (PR#3139). (cherry picked from commit 9ed6fba2b4685ced2340feff03da5a12ed14b003)
Performance improvement and Windows-specific bugfix (PR#3139). (cherry picked from commit 9ed6fba2b4685ced2340feff03da5a12ed14b003)