DIAP-388

Part of DIAP-388