Merge branch 'hotfix/2.5.8'
fixed GridSettings not being Serializable and causing projects not to render
Merge branch 'hotfix/2.5.9' into develop