3.14 DRM merge