DIAP-418

Part of DIAP-418