Merge branch 'release/2.3.5' into develop
test_save still causing an issue; commenting a line for now until periodic issue can be resolved
Update to version v2.3.6
Merge branch 'release/2.3.6'