FS-5256 --resolve
FS-5256