DIAP-518

Part of DIAP-518