Merge branch 'release/5.2.0' into develop