Merge changes from main branch