(#2814) - Revive the merge tree tests