FS-6005 --resolve