Merge branch 'cherry-pick-fbf59c98' into 'testing'

MLAB-642: fixing the content format

See merge request !138
1 job for testing in 19 seconds (queued for 3 seconds)