fix for managing distribution references
Merge branch 'hotfix-0.6.2' into develop