FS-5015 --resolve