Merge branch 'pinhole_bugfix' into 'master'

Bug fix for 2 pinholes.

See merge request !3756
10 jobs for master in 124 minutes and 38 seconds (queued for 2 seconds)