FS-5163 --resolve
FS-5087 --resolve