restored gatekeep_mgmt based on this commit: 546fa5c24674074823d6cb408c59db01fdeaa472