DIAP-284

Part of DIAP-284