Port latest mainline commits