Just to test, I combined the patch from #3126566-72: Allow Drupal to work wit...