Product code normalization allows | and @ characters in the code
Version bump
Merge branch 'release/1.25' into develop