Merge 'origin/develop' into dtc-tostring-590

Fix conflicts in changes.xml
2 jobs for dtc-tostring-590 in 21 minutes and 49 seconds (queued for 7 seconds)
latest