3.5.2.1 release
Merge branch 'release/3.5.2.1' into develop