DIAP-689

Part of DIAP-689