FS-5845 --resolve