Merge changes from main branch for testing