DIAP-038

Part of DIAP-038