Adding patch to fix issue.
Similar reported issue : https://www.drupal.org/no...