fix menu builder for private items
Merge branch 'master' into 2.3