Initial commit from package-template
Merge branch 'package-template-import'