Merge "merge-upstream/v6.1.82 from branch/tag: upstream/v6.1.82 into branch: cos-6.1" into cos-6.1