Unify extra pattern data
Merge branch 'release' into upstream