DIAP-353

Part of DIAP-353