FS-6248 --resolve
FS-6235