Merge branch 'hotfix/6.1.7.1' into stable/6
Added missing files to distribution tarball
Merge branch 'hotfix/6.1.7.2' into develop/6