Forward port rename race condition comments and changes from 1.4-master.