Backporting to MSCV 10