Draft changes for Windows & Linux BTE & SE