otw - In the middle of refactoring the OCPropertyField class and dependent code.
otw - Some strange merge.