DIAP-619

Part of DIAP-619