Merge "merge-upstream/v5.4.81 from branch/tag: upstream/v5.4.81 into branch: cos-5.4" into cos-5.4