Merge "Add menu to show properties, add feature flag."