master updates after Admin Plugin