Revert "Revert "Up to 13.2""

This reverts commit 24ba368c23cb7782cba68b71ca7a8528d1b504b4.
Trying to fix