merge up 2014.7