FS-6348 part1
FS-6348 --resolve