DIAP-635

Part of DIAP-635