* add workaround for Intel Windows driver issue * applying safeguard to all GPUs also a minor refactor * partial revert