Allow re-render to keep values for Object and NestedModel operator
merge master from powmedia
Merge with develop
Merge