Some patches landed, others rebased / cleaned up