FS-5169 --resolve