TDI-31231:default encoding for context property.
Merge branch 'maintenance/5.6'