FS-6054 --resolve