Merge "Prevent side channel package installation enumeration"