Merge "Stop hiding ReferencesHidden"