DIAP-496

Part of DIAP-496