5.46.2.8

  • [Other] Refactorings and other fixes (#18441)(#18463)(#18566)(#18573)