58.4.5: Backporting fixes