Merge branch 'jc/1.7.0-status' into jch