merge in upstream changes, change to unordered pub list