Merge branch 'rs/memmem' into maint