Merge changes from fork