Merge forward from 2014.7 was messy