Merge branch 'rs/branch-del-symref' into maint