Merge "Rewrite my menu preferences to avoid ProjectState caching"