signed off Bug 7284: Authority matching improvements