24.60.1 (2021-02-22) Bug Fixes rebase if automerging even if rebaseWhen=conflicted (#8796) (8e7e41f) Code Refactoring file-based alert aggregation (4b62acc)