Merge branch 'rs/stat-data-unaligned-reads-fix' into maint