FS-5829 --resolve