Merge branch 'ManualMergeIndex' into 'master'

Manual merge index

See merge request !242
2 jobs for master in 1 minute and 56 seconds (queued for 1 second)
Status Job ID Name Coverage
  Before
passed #4866
documentation

00:00:39

 
  Build
passed #4867
snapshot

00:01:17