Merge tag '0.29.2'