Merged changes from main repository