Merge "Add tagging for CLI to match with portal"