Not merging ACL and menu entry yet

(cherry picked from commit bd07877f)
(cherry picked from commit 15b8b918)