Created separate issue for D7 backport - https://www.drupal.org/node/2826866#...