FS-5586 --resolve