Merged in uncommited changes.