FS-5398 --resolve
FS-5390 --resolve