DIAP-610

Part of DIAP-610