Merge proposals

kernelstub has no merge proposals.