FS-5641 --resolve
rebuild