FS-5977 --resolve