FS-5219 --resolve