I believe it was partially resolved as part of other issue.

Could you take a look and send a PR for few more changes that are required?