Jaanus Hansen, if this is still an issue, please check to see if there is already an issue open with your use case; if not, please open a new issue with your pull request.