Sync with 13.2beta1

Grab upstream changes on Gotham branch