solve 2544_Older_Research_Bldg_No_7
Merge branch 'feature-2544'