DIAP-398

Part of DIAP-398