Fixes to JSON Module to properly support more complex object types.
Merge remote-tracking branch 'origin/dev' into dev