DIAP-611

Part of DIAP-611