Auto merge of #160668 - sjwang05:next-solver-orphanck, r=lcnr