DIAP-370

Part of DIAP-370