DIAP-620

Part of DIAP-620