FS-5342 --resolve
FS-5344 --resolve