Commit from win8. After building worker-09-44-24-06