FS-5278 --resolve