A few changes from central-master