Add encoding headers to avoid invalid byte sequence error in imports
Merge branch 'MH-871' into dev