Merge branch 'feature/world-sync' into develop