Sync with 13.2beta1

Grabbed upstream changes on Gotham branch