Merge "merge from branch/tag: krsi/krsi-backports-r2 into branch: cos-5.10" into cos-5.10