Merged changes manually.