merge RC20140807 into integration