Yep, that'd be the plan, separate thing PR. I would do it this week but timing is looking tight.