Merge "Fixes Context Hub feature naming and documentation"