BackMerge commit '98477740630f270aecf648f1d6a9dbc6027d4ff1' into drm-fixes