Merge branch 'hotfix/kb'
Merge branch 'release/v1.7-RC3'
Merge branch 'release/v1.7-RC4'
Merge remote-tracking branch 'upstream/master' into develop