IDEA-91530 Tab highlighting error when sorted alphabetically
Merge remote-tracking branch 'origin/master'