DIAP-614

Part of DIAP-614