FS-3743 --resolve
FS-4898 --resolve