* Add master key override to live query ACL checks * Fix mockClient so masterKey tests work correctly