Merged latest changes from the main repository