Merge branch 'fix/base64_encoded_data_in_json' into 'Support/2.6.X'

Fix/base64 encoded data in json

See merge request !437
2 jobs for Support/2.6.X