Support both stable & test dumps at the same time