FS-6228 --resolve