Merged oldstable branch into stable

2 jobs for !87 with branch/stable in 52 seconds (queued for 2 seconds)
latest merge request