DIAP-519

Part of DIAP-519