FS-6010 --resolve
FS-5989 --resolve