Merge branch 'release/7.x-0.35.9' into develop
Tagging version 7.x-0.36
Merge branch 'release/7.x-0.36'