Cherry pick `Update changelog for `r2.1.0` (11745)` into `r2.1.0`
beep boop [🤖]: Hi @github-actions[bot] 👋,
    
    we've cherry picked #11745 into  for you! 🚀
    
    Please review and approve this cherry pick by your convenience!