DIAP-329

Part of DIAP-329