CW-438 Applied official patch from Drupal community