Merge "merge-72178c4680e3 from branch/tag: contrib/cos-6.1-idpf into branch: cos-6.1" into cos-6.1