fixes #6497: New Organization: Focus should exist in Name field
Merge remote branch 'origin/develop' into develop