Merge "Prevent side channel package installation enumeration" into tm-dev