Fix typo
Merge branch 'fix-typo' into develop
Merge branch 'feature/fix-folding' into develop
Update credits