DIAP-691

Part of DIAP-691