Merge "Do transition calculations with changeinfos directly"