Merged changes from main branch