testmerged_prs from 210407 on Terry
Activate Windows Go to Settings to activate Windows