publish: merge and update

generated from commit 4c807d1a485af2535179b9d520c90ad3c2e8f7e2