Publish fix

rebase of #3410