Merge branch 'hotfix/#6207-underscore-naming-strategy-not-studlycase'

Close #6207
Fixes typo algorihtm -> algorithm
Merge branch 'typo/#6213-typo-fix' into develop

Close #6213
Forward Port #6213