DIAP-639

Part of DIAP-639