DIAP-607

Part of DIAP-607