Yes, but maybe not in this PR. I would suggest to create an issue about it.