FS-4932 FS-5090 --resolve