publish: Merge remote-tracking branch 'upstream/master'

generated from commit 7b647fc4d4d5983c69285b472aeb2ddd53c85366