publish: chore: merge other work

generated from commit 2669e48a73f39e696a02f1832e4712c52e976531