UI-3299: UI bug in CLV select content
Merge commit '39d3ca9688598c678c0b76bdc7b241a0f08c35a2' into HEAD