Merge branch 'release/2.1.1'
Merge branch 'release/2.1.2'

ge to explain why this merge is necessary,
added a handler for the enter