FS-6058 --resolve
FS-2999 --resolve