release 7.x-0.35
Merge branch 'release/7.x-0.35' into develop