Restore the correct selections after "Toggle line comment"
Merge remote-tracking branch 'upstream/master' into fix-7293
Add unit tests
Merge pull request #7301 from SAPlayer/fix-7293

Restore the correct selections after "Toggle line comment"