solve 2242_Era_Name
Merge branch 'feature-2242_Era_Name'