Merge changes into multi-world branch