DIAP-421

Part of DIAP-421