DIAP-688

Part of DIAP-688