Added regex to get rid of overrides.
Merged.