Clean overrides. [1384]
Bring in contents of IDV pull req 35 for testing.

[1384]