DIAP-061

Part of DIAP-061