Merge "merge-upstream/v6.1.134 from branch/tag: upstream/v6.1.134 into branch: main-R109-cos-6.1" into main-R109-cos-6.1