DIAP-697

Part of DIAP-697