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