Merge production into master for Midterm Report