Merge "On CPS rebind, check if package is allowed"