Merge "build/package scan-view"