Merge "merge-upstream/v6.6.83 from branch/tag: upstream/v6.6.83 into branch: cos-6.6" into cos-6.6