Also check that the expected partial answer in returned too. (cherry picked from commit 580f872fe1)
580f872fe1