Fiddling with Json properties.
Fiddling with Json properties.
Merge commit 'b80849cea1d4922e7eeeda2ef6635530c66c8ed1'

Merging changes from upstream.
Merge commit '8cdfcaf8ee0d210bb5bb1738c6ede0f39f01569f'

Merging changes from upstream.