merges Feature/new globe into develop