FS-5513 --resolve
FS-4969 --resolve