FS-6223 --resolve