Merge branch 'rs/apply-lose-prefix-length' into maint