Merge branch 'dev' into development
Merge branch 'dev' into development
Merge branch 'development' into dev
updated package file parsing