DIAP-649

Part of DIAP-649