DIAP-517

Part of DIAP-517