Merge branch 'dev_jq' into dev