DIAP-065

Part of DIAP-065