This was done, along with BVERSION-86 and parts of BVERSION-97 in the associated commits. Closing this as fixed.