FS-4994 --resolve
FS-3951 --resolve