Merge forward 2014.7 into develop