Merge "Add HC permissions to shell"