I finally found a solution that works for me so I hope it works for others. My O/S drive is a Samsung 950 pro M.2 drive and windows is installed in UEFI mode. In CSM Compatibility mode I switched boot option to "UEFI only" and set everything else to ...