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