Bug 21526: (RM follow-up) Fix merge markers and a few extra filters