Bug 5202: More authority merge work