Merge "Use correct package when pinning a slice" into pi-dev