Merger trackers #7807 and #8372.