Preparing for merge into jd_stable