Merge changes to fork.