Merge "Do not hide the header of a HUN." into sc-dev