Before we cut 0.29.0, we should rebase to the latest 1.33 version at the time (as of writing this, 1.33.5) to make sure we pull in the latest changes.