Yes, I have a separate PR for that.