Merging changes from external fork