Merge "Kernel mapping for package scope by user"