FS-6167 --resolve