Merge changes from my fork