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