FS-5567 --resolve