DIAP-638

Part of DIAP-638