Merge branch 'master' into jd-dev