@krina.addweb : For this issue #2 patch is perfect. Because the changes you ...

@krina.addweb : For this issue #2 patch is perfect. Because the changes you have mention for that one issue is created and added the patch here https://www.drupal.org/node/2826827.

So no need to consider the #4 changes for this issue.