@stefanpenner were you wanting this to be done before merge?