Remove differences between 'master' and '4.0.x'