[WIP][3.9] Databox merge