DIAP-325

Part of DIAP-325