[D11] merge from d11 main. NB: since updating, getting a gpu memory OOM trying to allocate 2GB(?!) but everything seems to continue ok regardless.