Unrelated, taking off the 2.5 milestone target since it affects string changes again and backporting those might not be good.
Unrelated, taking off the 2.5 milestone target since it affects string changes again and backporting those might not be good.