Merge up 2014.7