XD-466 Add Json support to Tuple
XD-466 - renamed JSon to Json and minor changes per PR review comments
XD-466 - revert build.gradle
Merge branch 'XD-466'