Updates for 2014 GA analyses and merge conflict fix