Improve ObjectConstancy
Merged.