DIAP-695

Part of DIAP-695