Backport: rename to slash
More renames
Merge branch 'master' into dev