rasa, I'm not sure if this helps if this PR is closed. Unless, of course, it is opened for further review.