FS-5675 --resolve