FS-5913 --resolve