Merge branch 'issue-836' into develop

Conflicts:
	src/changes/changes.xml
5 jobs for develop in 23 minutes and 14 seconds (queued for 2 seconds)