Merge branch 'rs/blame-code-cleanup' into maint