Merge in packaging updates
Reapply source/format and bindings-to-package changes automatically