merge until Jul 10, 2014