Re-rolling patch against 8.6.x branch.
I have also fixed couple of issues men...

Contribution Date
Technology
Contribution Project
Contribution Details

Re-rolling patch against 8.6.x branch.
I have also fixed couple of issues mentioned by @alexpott
Fixed usage of DI
We still needs some inputs from @alexpott about implementation approach as mentioned by @claudiu.cristea

Issue Status
Needs Review
Contribution Author
Files count
1
Patches count
1