ModuleAuth done for #548