Small change to support CustomMenuVisibilities