FS-5894 --resolve