@theopolis FYI: I've been working on issue #2322 and I have a patch ready to push. When I complete the CLA for our company I will push the patch and let you know.