Merged studyLocation with master.