Merge commit 'origin/mark' into jq