DIAP-641

Part of DIAP-641