Sync with Gotham13.1

Sync with Gotham 13.1 
I Will merge it tomorrow night by myself if nobody expresses concern about it as it is a pure sync PR