FS-5307 --resolve