MOC 20688: Supporting Windows 8.1