Merge branch 'develop' into 'issue-797'

# Conflicts:
#   src/changes/changes.xml
2 jobs for issue-797 in 21 minutes and 23 seconds (queued for 3 seconds)