Merge MTD updates into -next