AI-522 : separated text and button events via cell composition
Merge remote-tracking branch 'origin/version3' into version3