Merge branch 'master'
Update package name.
Merge branch 'scaffold_change'