FS-5010 --resolve