DIAP-617

Part of DIAP-617