DIAP-403

Part of DIAP-403