Gotham 13.2 backports

For 13.2a1