5.39.6.59

  • [Other] Refactorings and other fixes (#15495)