merging all changes on multi-world branch