Yeah, I think so. I just chatted with James and will email Trevor P about it. Seems like a good change that we could upstream to core.