DIAP-618

Part of DIAP-618