DIAP-390

Part of DIAP-390