DIAP-082

Part of DIAP-082