* commit '5f70b3b1d3360dcfa2716d610c04efa3e309521e': Fix issues around process teardown after full-data restore