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

* commit 'd3df33e6c24e3cd62991b2a65833f16dc05a17b8':
  Some clean-up for the handling of HSelect in LSE