Merge branch 'topic/mode_fixup-optional' into topic/drm-misc