DIAP-399

Part of DIAP-399