FS-5689 --resolve