- [1.17.1] Backport #5740 and #7355 to 1.17.1 (#7384)