FS-5132 --resolve