Merged additional changes.