FS-5975 --resolve
FS-5834 --resolve