[GIT PULL FOR v3.18] DRM core change