FS-5236 --resolve
FS-5203 --resolve