Merge from twitter/finatra