Merge "Some clean-up for the handling of HSelect in LSE"