Merge branch 'cpack-ifw-fix-repo-attributes' into release