DIAP-389

Part of DIAP-389