AI-482 - changing list control design (intermediate state)
Merge remote-tracking branch 'origin/version3' into version3