DIAP-396

Part of DIAP-396