Merge "Integrate the latest changes" into main