Self compile
Merge branch 'release/3.5.0' into develop