Merge branch '2162-processing-published-entries-fails-when-using-encoding-keyword' into 'develop'

Resolve "processing published entries fails when using encoding keyword"

Closes #2162

See merge request !2140