FS-6165 --resolve