Merge Gotham-beta4

Sync with the gotham_beta4  tag