Merge branch 'release/0.2.36' into develop
Version bump to 0.2.36.1
Merge branch 'release/0.2.36.1'