Merge branch 'master' into 'patch-3'

Reverse merge master changes to patch branch.

See merge request !133
1 job for patch-3 in 9 seconds (queued for 1 second)
Status Name Job ID Coverage
  Document
passed generate-docs #117258

00:00:09