Merge "Tweaking workaround to use fallback with null buffer"