DIAP-333

Part of DIAP-333