Closes #3091898 #3225480
The MR has no conflict with 8.x-1.4 tag, which is latest release of 8.x-1.x, although recent branch 8.x-1.x has conflict, but MR was done to apply old patches to module so it could be used on a working drupal site normally