Added pub_all handling
Merge conflict