FS-6186 --resolve