DIAP-630

Part of DIAP-630