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