DIAP-064

Part of DIAP-064