DIAP-478

Part of DIAP-478