[UPDATE] Bump to 2.5.2
Merge branch 'release/2.5.2' into develop