#SCL-6357 fixed
Merge remote-tracking branch 'origin/master'
Disabled rearranger test broken due to IDEA-96723 fix.
Merge remote-tracking branch 'origin/master'