Merged stable branch into stable

5 jobs for branch/default in 3 minutes and 20 seconds