Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json