DIAP-508

Part of DIAP-508