@sagotsky I get a page not found when I try to access this patch on Drupal, is it possible that it got lost in the d.org carnage?  I am a bit hesitant to merge this as well since d.org has been so flaky lately.  Can we add the patch in a separate PR?