DIAP-343

Part of DIAP-343