CD-4053 : applying the patch from https://www.drupal.org/node/1084436#comment-8807621