DIAP-382

Part of DIAP-382