Merge changes into fork