Merge "merge-upstream/v6.12.41 from branch/tag: upstream/v6.12.41 into branch: cos-6.12" into cos-6.12