FS-5857 --resolve