FS-5302 --resolve