Actually @pp-mo I would appreciate it if you could put this into your PR you mentioned in your other comments.