Merged updates from Gotham-branch