Today
Merge from gpuinstancefix