Merge branch 'typo/#6215-console-adapter-typo'

Close #6215
Merge branch 'typo/#6217-callback-paginator-test-typos'

Close #6217
Merge remote-tracking branch 'upstream/master' into develop