Merge "always use sitepackages"