Merge changes from main branch into my fork version