Create master-7
Merge remote-tracking branch 'upstream/master'