Merge branch 'release/v0.36'
Merge tag 'v0.36' into develop

v0.36