Merge branch 'typo/#6213-typo-fix'

Close #6213
Console Adapter typo
Merge branch 'typo/#6215-console-adapter-typo' into develop

Close #6215
Forward Port #6215