FS-5605 --resolve
FS-5752 --resolve