Has this patch been submitted upstream? If so can we add a link in a comment here?