HH-48207 add default encoding support in grizzly
Merge remote-tracking branch 'origin/HH-48207' into release-candidate