FS-5694 --resolve
FS-5648 --resolve