FS-4532 --resolve
FS-5082 test this patch