Merge branch 'pb/autocorrect-wrapper'