feat(publisher): manual merge of #1708