[#873605] Updates in thimble for the changes in the makeapi.