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

generated from commit 05b1a484edfc4986f8bba348211560ff2ecbe5b0