FS-5807 --resolve