ERA matching (Cont)

https://www.pivotaltracker.com/story/show/75490098