Merge branch 'yjarosz-master-patch-45274' into 'master'

quick update

See merge request !89
3 jobs for master in 55 seconds