Merge branch 'jm/maint-strncpy-diff-no-index'