- Pulled changes from cc2014 branch