Merge branch 'release/2.5.2' into production
Merge tag 'v2.5.2'

2.5.2