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)
Status Name Job ID Coverage
  Verify
passed verify #3509

00:19:29

 
  Visualize
passed coverage-import #3510

00:01:11

97.0%
 
  Deploy
passed deploy:artifacts #3511

00:02:33

passed deploy:site #3512

00:00:27

passed performance