Apply appropriate changes from main branch to bring win0405-branch up