Merge branch 'scratch-rebuild'
Merge branch 'master' into scratch-rebuild
package name change

misspelling