FS-6349 --resolve