Merge branch 'jc/maint-1.6.0-blame-s' into maint