DIAP-631

Part of DIAP-631