FS-5149 --resolve