Merge branch 'patch-123' into 'master'

Update Team 3(OHT)

See merge request !156
2 jobs for master in 15 seconds (queued for 1 second)