Resolve ZCLOUD-153