Update to proc to use member objects instead of refs
Merge from master