Merge branch 'release/2.1.0' into develop
Focus window after restoring.
Update ChangeLog and publish.
Merge branch 'release/2.1.1'