FS-5466 --resolve
FS-5470 --resolve