Merge branch 'master' into rename_symmetric

4 jobs for rename_symmetric in 10 minutes and 19 seconds