DIAP-696

Part of DIAP-696