Can you please submit this patch as a pull-request upstream and link to the upstream patch submission in a comment in this commit. Thanks!