merge master

4 jobs for fix_smoothing in 9 minutes and 26 seconds