Improvements to windows-metadata
#3268
+320
−322
Merged
windows-metadata
#3268