Merge in some modifications from work machine.