DIAP-680

Part of DIAP-680