Merge "merge 4ce22057, regen api/current.txt"