DIAP-435

Part of DIAP-435