DIAP-549

Part of DIAP-549