FS-1327 --resolve