DIAP-625

Part of DIAP-625