Merge branch 'patch-134' into 'master'

Update Team 3(OHT)

See merge request !172
2 jobs for master in 16 seconds (queued for 2 seconds)