Merge branch 'jk/1.7.0-status'