FS-6157 --resolve