Gotham RC1

Sync with upstream  Gotham RC1