Intermediate commit so Britain can continue working on this branch.  Tests are failing because of new authorization work.