Merge "Use handle in one case that spans a gc-point." into lmp-dev