[git pull] drm final final final fixes