Merge branch 'GONRG-3773_Improve_performance' into 'master'

GONRG-3773: Improve_performance

See merge request !13
4 jobs for master in 2 minutes and 59 seconds (queued for 6 seconds)