FS-6219 --resolve