commit from win8.1 12.3